Stop copying an old ostree-trivial-httpd.xml from debian/dist/ into source tree

Upstream distributes it again.

diff --git a/debian/changelog b/debian/changelog
index 539114d3c28e1efb4302249f02ba033c2c942043..752ac181436a99f271f4282fd21e221260b88398 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ostree (2017.11-1) UNRELEASED; urgency=medium
   * Adjust Description and Upstream-Name to emphasize libostree
   * Classify new ostree-tmpfiles.conf as part of ostree-boot, and so
     don't install it yet
+  * Stop copying an old ostree-trivial-httpd.xml from debian/dist/
+    into source tree. Upstream distributes it again.
 
  -- Simon McVittie <smcv@debian.org>  Wed, 30 Aug 2017 10:09:26 +0100
 

diff --git a/debian/copyright b/debian/copyright
index 78f2ceafd14ca8fb470ae1bccf057443ffac05bb..e740033658ad52de258e87938db390804cc8ce83 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,6 @@ Source: https://github.com/ostreedev/ostree/
 
 Files:
  *
- debian/dist/*
 Copyright:
  © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  © 1999-2000, 2002-2005 Free Software Foundation, Inc.

diff --git a/debian/dist/ostree-trivial-httpd.xml b/debian/dist/ostree-trivial-httpd.xml
deleted file mode 100644 (file)
index 2b84685..0000000
--- a/debian/dist/ostree-trivial-httpd.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-Copyright 2011,2013 Colin Walters <walters@verbum.org>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
--->
-
-<refentry id="ostree">
-
-    <refentryinfo>
-        <title>ostree trivial-httpd</title>
-        <productname>OSTree</productname>
-
-        <authorgroup>
-            <author>
-                <contrib>Developer</contrib>
-                <firstname>Colin</firstname>
-                <surname>Walters</surname>
-                <email>walters@verbum.org</email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>ostree trivial-httpd</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>ostree-trivial-httpd</refname>
-        <refpurpose>Simple webserver</refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-            <cmdsynopsis>
-                <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
-            </cmdsynopsis>
-    </refsynopsisdiv>
-
-<!-- Don't entirely understand this command.  Needs details, better content-->
-    <refsect1>
-        <title>Description</title>
-
-        <para>
-            This runs a simple webserver and keeps it running until killed.  If DIR is not specified, it defaults to the current directory.
-        </para>
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>--daemonize</option>,<option>-d</option></term>
-
-                <listitem><para>
-                    Fork into background when ready.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--autoexit</option></term>
-
-                <listitem><para>
-                    Automatically exit when directory is deleted.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--port-file</option>,<option>-p</option>="PATH"</term>
-
-                <listitem><para>
-                    Write port number to PATH (- for standard output).
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--port</option>,<option>-P</option></term>
-
-                <listitem><para>
-                    Use the specified TCP port to listen on.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--force-range-requests</option></term>
-
-                <listitem><para>
-                    Force range requests by only serving half of files.
-                </para></listitem>
-            </varlistentry>
-        </variablelist>
-    </refsect1>
-
-<!-- NEED EXAMPLE OUTPUT HERE!-->
-    <refsect1>
-        <title>Example</title>
-        <para><command>$ ostree trivial-httpd</command></para>
-    </refsect1>
-</refentry>

diff --git a/debian/rules b/debian/rules
index 50cebe83b9963609e30ef7182d2cf6aba56856b6..8dfef084807f01852d8acb1c41af238399ff2316 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,8 @@ export LC_ALL=C.UTF-8
 %:
        dh $@ --with=gir
 
-override_dh_auto_clean:
-       rm -f man/ostree-trivial-httpd.xml
-       if [ -e Makefile ]; then dh_auto_clean; fi
-
 override_dh_autoreconf:
        env NOCONFIGURE=1 dh_autoreconf ./autogen.sh
-       cp debian/dist/ostree-trivial-httpd.xml man/
 
 configure_options = \
        --enable-installed-tests \